From 81b9a6d8826ce35f5ae4e4a4f10ec09fbf37ac37 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Mon, 7 Nov 2005 14:55:23 +0000
Subject: [PATCH] * Trim the first and last newlines of strings passed via
 <onlyinclude> to avoid whitespace buildup

---
 includes/Parser.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/includes/Parser.php b/includes/Parser.php
index 6228154b08..9b5c593a1a 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2497,7 +2497,7 @@ class Parser
 					preg_match_all( '/<onlyinclude>(.*?)<\/onlyinclude>/s', $text, $m );
 					$text = '';
 					foreach ($m[1] as $piece)
-						$text .= $piece;
+						$text .= $this->trimOnlyinclude( $piece );
 				}
 				# Remove <noinclude> sections and <includeonly> tags
 				$text = preg_replace( '/<noinclude>.*?<\/noinclude>/s', '', $text );
@@ -2572,6 +2572,19 @@ class Parser
 			return $text;
 		}
 	}
+	
+	/**
+	 * Trim the first and last newlines of a string, this is not equivalent
+	 * to trim( $str, "\n" ) which would trim them all.
+	 *
+	 * @param string $str The string to trim
+	 * @return string
+	 */
+	function trimOnlyinclude( $str ) {
+		$str = preg_replace( "/^\n/", '', $str );
+		$str = preg_replace( "/\n$/", '', $str );
+		return $str;
+	}
 
 	/**
 	 * Translude an interwiki link.
-- 
2.20.1